@nocobase/client 2.0.0-alpha.55 → 2.0.0-alpha.56

package/es/flow/models/base/GridModel.d.ts

@@ -70,4 +70,23 @@ export declare class GridModel<T extends {
 export declare function transformRowsToSingleColumn(rows: Record<string, string[][]>, options?: {
     emptyColumnUid?: string;
 }): Record<string, string[][]>;
+export declare function recalculateGridSizes({ position, direction, resizeDistance, prevMoveDistance, oldSizes, oldRows, gridContainerWidth, gutter, columnCount, }: {
+    position: {
+        rowId: string;
+        columnIndex: number;
+        itemIndex: number;
+    };
+    direction: 'left' | 'right' | 'bottom' | 'corner';
+    resizeDistance: number;
+    prevMoveDistance: number;
+    oldSizes: Record<string, number[]>;
+    oldRows: Record<string, string[][]>;
+    gridContainerWidth: number;
+    gutter?: number;
+    columnCount?: number;
+}): {
+    newRows: Record<string, string[][]>;
+    newSizes: Record<string, number[]>;
+    moveDistance: number;
+};
 export {};

package/es/flow/models/blocks/details/DetailsBlockModel.d.ts

@@ -32,5 +32,6 @@ export declare class DetailsBlockModel extends CollectionBlockModel<{
     handlePageChange: (page: number) => Promise<void>;
     refresh(): Promise<void>;
     renderPagination(): React.JSX.Element;
+    renderConfigureActions(): React.JSX.Element;
     renderComponent(): React.JSX.Element;
 }

package/es/index.mjs

@@ -3833,6 +3833,9 @@ const bp = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   get readPrettyFormSettings() {
     return readPrettyFormSettings;
   },
+  get recalculateGridSizes() {
+    return recalculateGridSizes;
+  },
   get recordBlockInitializers() {
     return recordBlockInitializers;
   },
@@ -9667,7 +9670,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-alpha.55", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.0-alpha.56", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9690,10 +9693,10 @@ const name = "@nocobase/client", version = "2.0.0-alpha.55", license = "AGPL-3.0
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.0-alpha.55",
-  "@nocobase/flow-engine": "2.0.0-alpha.55",
-  "@nocobase/sdk": "2.0.0-alpha.55",
-  "@nocobase/utils": "2.0.0-alpha.55",
+  "@nocobase/evaluators": "2.0.0-alpha.56",
+  "@nocobase/flow-engine": "2.0.0-alpha.56",
+  "@nocobase/sdk": "2.0.0-alpha.56",
+  "@nocobase/utils": "2.0.0-alpha.56",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -68258,32 +68261,43 @@ function recalculateGridSizes({
   gutter: l = 16,
   columnCount: c = 24
 }) {
-  var g, x;
-  const u = _.cloneDeep(i), d = _.cloneDeep(r), p = d[e.rowId] || [], m = l * (p.length - 1), h = Math.floor(o / (a - m) * c);
+  var y, S;
+  const u = _.cloneDeep(i), d = _.cloneDeep(r), p = d[e.rowId] || [], m = l * (p.length - 1);
+  let h = Math.floor(o / (a - m) * c);
   if (h === n)
     return { newRows: u, newSizes: d, moveDistance: h };
-  if ((x = d[g = e.rowId]) != null || (d[g] = [c]), d[e.rowId][e.columnIndex] += h - n, t === "left" && e.columnIndex > 0 && (d[e.rowId][e.columnIndex - 1] -= h - n, d[e.rowId][e.columnIndex - 1] === 0 && removeEmptyColumnFromRow({
+  (S = d[y = e.rowId]) != null || (d[y] = [c]);
+  const g = d[e.rowId];
+  let x = h - n;
+  const b = t === "left" && e.columnIndex > 0, C = t === "right" && e.columnIndex < g.length - 1;
+  if (!b && !C && x > 0) {
+    const v = g.reduce((F, A) => F + A, 0), P = c - v;
+    if (P <= 0)
+      return { newRows: u, newSizes: d, moveDistance: n };
+    x > P && (h = n + P, x = P);
+  }
+  if (d[e.rowId][e.columnIndex] += x, t === "left" && e.columnIndex > 0 && (d[e.rowId][e.columnIndex - 1] -= x, d[e.rowId][e.columnIndex - 1] === 0 && removeEmptyColumnFromRow({
     rows: u,
     sizes: d,
     position: e,
     direction: "left"
   })), t === "left" && e.columnIndex === 0) {
-    const b = d[e.rowId].slice(1).reduce((y, S) => y + S, 0);
-    d[e.rowId][0] < c - b && addEmptyColumnToRow({
+    const v = d[e.rowId].slice(1).reduce((F, A) => F + A, 0);
+    d[e.rowId][0] < c - v && addEmptyColumnToRow({
       rows: u,
       sizes: d,
       position: e,
       direction: "left"
     });
   }
-  if (t === "right" && e.columnIndex < d[e.rowId].length - 1 && (d[e.rowId][e.columnIndex + 1] -= h - n, d[e.rowId][e.columnIndex + 1] === 0 && removeEmptyColumnFromRow({
+  if (t === "right" && e.columnIndex < d[e.rowId].length - 1 && (d[e.rowId][e.columnIndex + 1] -= x, d[e.rowId][e.columnIndex + 1] === 0 && removeEmptyColumnFromRow({
     rows: u,
     sizes: d,
     position: e,
     direction: "right"
   })), t === "right" && e.columnIndex === d[e.rowId].length - 1) {
-    const b = d[e.rowId].slice(0, -1).reduce((y, S) => y + S, 0);
-    d[e.rowId][e.columnIndex] < c - b && addEmptyColumnToRow({
+    const v = d[e.rowId].slice(0, -1).reduce((F, A) => F + A, 0);
+    d[e.rowId][e.columnIndex] < c - v && addEmptyColumnToRow({
       rows: u,
       sizes: d,
       position: e,
@@ -73436,42 +73450,55 @@ class DetailsBlockModel extends CollectionBlockModel {
       }
     );
   }
+  renderConfigureActions() {
+    return /* @__PURE__ */ jsx(
+      AddSubModelButton,
+      {
+        model: this,
+        subModelKey: "actions",
+        subModelBaseClass: this.getModelClassName("RecordActionGroupModel"),
+        afterSubModelInit: (o) => O(this, null, function* () {
+          o.setStepParams("buttonSettings", "general", { type: "default" });
+        }),
+        children: /* @__PURE__ */ jsx(FlowSettingsButton, { icon: /* @__PURE__ */ jsx(SettingOutlined, {}), children: this.translate("Actions") })
+      },
+      "details-actions-add"
+    );
+  }
   renderComponent() {
     var c, u;
     const { colon: o, labelAlign: n, labelWidth: r, labelWrap: i, layout: a } = this.props, l = !!((u = (c = this.flowEngine) == null ? void 0 : c.flowSettings) != null && u.enabled);
     return /* @__PURE__ */ jsxs(Fragment$1, { children: [
-      /* @__PURE__ */ jsx(DndProvider, { children: /* @__PURE__ */ jsx("div", { style: { padding: this.context.themeToken.padding, textAlign: "right" }, children: /* @__PURE__ */ jsxs(Space$1, { children: [
-        this.mapSubModels("actions", (d) => {
-          if (!(d.hidden && !l))
-            return /* @__PURE__ */ jsx(Droppable, { model: d, children: /* @__PURE__ */ jsx(
-              FlowModelRenderer,
-              {
-                model: d,
-                showFlowSettings: { showBackground: !1, showBorder: !1, toolbarPosition: "above" },
-                extraToolbarItems: [
+      /* @__PURE__ */ jsx(DndProvider, { children: /* @__PURE__ */ jsx(
+        "div",
+        {
+          style: {
+            textAlign: "right",
+            lineHeight: "0px",
+            padding: l && this.context.themeToken.padding
+          },
+          children: /* @__PURE__ */ jsxs(Space$1, { children: [
+            this.mapSubModels("actions", (d) => {
+              if (!(d.hidden && !l))
+                return /* @__PURE__ */ jsx(Droppable, { model: d, children: /* @__PURE__ */ jsx(
+                  FlowModelRenderer,
                   {
-                    key: "drag-handler",
-                    component: DragHandler$1,
-                    sort: 1
+                    model: d,
+                    showFlowSettings: { showBackground: !1, showBorder: !1, toolbarPosition: "above" },
+                    extraToolbarItems: [
+                      {
+                        key: "drag-handler",
+                        component: DragHandler$1,
+                        sort: 1
+                      }
+                    ]
                   }
-                ]
-              }
-            ) }, d.uid);
-        }),
-        /* @__PURE__ */ jsx(
-          AddSubModelButton,
-          {
-            model: this,
-            subModelKey: "actions",
-            subModelBaseClass: this.getModelClassName("RecordActionGroupModel"),
-            afterSubModelInit: (d) => O(this, null, function* () {
-              d.setStepParams("buttonSettings", "general", { type: "default" });
+                ) }, d.uid);
             }),
-            children: /* @__PURE__ */ jsx(FlowSettingsButton, { icon: /* @__PURE__ */ jsx(SettingOutlined, {}), children: this.translate("Actions") })
-          },
-          "details-actions-add"
-        )
-      ] }) }) }),
+            this.renderConfigureActions()
+          ] })
+        }
+      ) }),
       /* @__PURE__ */ jsx(FormComponent, { model: this, layoutProps: { colon: o, labelAlign: n, labelWidth: r, labelWrap: i, layout: a }, children: /* @__PURE__ */ jsx(FlowModelRenderer, { model: this.subModels.grid, showFlowSettings: !1 }) }),
       this.renderPagination()
     ] });
@@ -77071,7 +77098,34 @@ function FieldDeletePlaceholder() {
   }).replaceAll("&gt;", ">");
   return /* @__PURE__ */ jsx(Tooltip, { title: l, children: /* @__PURE__ */ jsx(ExclamationCircleOutlined, { style: { opacity: "0.45" } }) });
 }
-const je = class je extends DisplayItemModel {
+const CustomWidth = ({ setOpen: e, t, handleChange: o, defaultValue: n }) => {
+  const [r, i] = useState(n);
+  return /* @__PURE__ */ jsx(
+    "div",
+    {
+      onClick: (a) => {
+        a.stopPropagation(), e(!0);
+      },
+      onMouseLeave: () => {
+        e(!0);
+      },
+      children: /* @__PURE__ */ jsxs(Space$1.Compact, { block: !0, children: [
+        /* @__PURE__ */ jsx(
+          InputNumber$1,
+          {
+            placeholder: t("Custom column width"),
+            value: r,
+            onChange: (a) => {
+              i(a);
+            },
+            style: { width: "100%", minWidth: 200 }
+          }
+        ),
+        /* @__PURE__ */ jsx(Button, { type: "primary", onClick: () => o(r), children: "OK" })
+      ] })
+    }
+  );
+}, je = class je extends DisplayItemModel {
   renderHiddenInConfig() {
     return this.fieldDeleted ? /* @__PURE__ */ jsx(FieldDeletePlaceholder, {}) : /* @__PURE__ */ jsx(
       Tooltip,
@@ -77282,6 +77336,7 @@ TableColumnModel.registerFlow({
     width: {
       title: tExpr("Column width"),
       uiMode(e) {
+        const t = e.model.props.width;
         return {
           type: "select",
           key: "width",
@@ -77297,7 +77352,20 @@ TableColumnModel.registerFlow({
               { label: 400, value: 400 },
               { label: 450, value: 450 },
               { label: 500, value: 500 }
-            ]
+            ],
+            dropdownRender: (o, n, r) => /* @__PURE__ */ jsxs(Fragment$1, { children: [
+              o,
+              /* @__PURE__ */ jsx(Divider$1, { style: { margin: "4px 0" } }),
+              /* @__PURE__ */ jsx(
+                CustomWidth,
+                {
+                  setOpen: n,
+                  handleChange: r,
+                  t: e.t,
+                  defaultValue: [50, 100, 150, 200, 250, 300, 350, 400, 450, 500].includes(t) ? null : t
+                }
+              )
+            ] })
           }
         };
       },
@@ -84110,6 +84178,7 @@ const models = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   isFilterValueEmpty,
   joinUrlSearch,
   operatorComponentProps,
+  recalculateGridSizes,
   transformNestedData,
   transformRowsToSingleColumn
 }, Symbol.toStringTag, { value: "Module" })), openView = defineAction({
@@ -88578,7 +88647,7 @@ const Display = (e) => {
   var y, S;
   const u = useFlowContext(), [d, p] = useState(e || ""), m = useRef(null), h = !!((S = (y = u.model.flowEngine) == null ? void 0 : y.flowSettings) != null && S.enabled);
   useEffect(() => {
-    r && p(e);
+    r !== !1 && p(e);
   }, [e]);
   const g = useCallback(
     (v) => {
@@ -95165,6 +95234,7 @@ export {
   parseVariablesAndChangeParamsToQueryString,
   primaryKey,
   readPrettyFormSettings,
+  recalculateGridSizes,
   recordBlockInitializers,
   recordBlockInitializers_deprecated,
   recordPickerViewer,